Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -r915d8a66e5d294a18f9452775406e36a3f8fbdc0 -rc5f90c4f9b42d985f16f99ad8732576b9217267a --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 915d8a66e5d294a18f9452775406e36a3f8fbdc0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) @@ -353,7 +353,7 @@ null, Enumerable.Empty(), new GeneralPipingInput(), - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -368,7 +368,7 @@ Enumerable.Empty(), null, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -383,7 +383,7 @@ Enumerable.Empty(), Enumerable.Empty(), null, - new SemiProbabilisticPipingInput()); + new NormProbabilityPipingInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -402,7 +402,7 @@ // Assert var parameter = Assert.Throws(test).ParamName; - Assert.AreEqual("semiProbabilisticInput", parameter); + Assert.AreEqual("normProbabilityInput", parameter); } [Test] @@ -442,7 +442,7 @@ ringtoetsPipingSurfaceLines, Enumerable.Empty(), new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -515,7 +515,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -580,7 +580,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -658,7 +658,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -740,7 +740,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -849,7 +849,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -975,7 +975,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); }; // Assert @@ -1061,14 +1061,14 @@ }; GeneralPipingInput generalInput = new GeneralPipingInput(); - SemiProbabilisticPipingInput semiProbabilisticInput = new SemiProbabilisticPipingInput(); + NormProbabilityPipingInput normProbabilityInput = new NormProbabilityPipingInput(); // Call IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, generalInput, - semiProbabilisticInput).ToArray(); + normProbabilityInput).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; @@ -1079,8 +1079,8 @@ Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile1.Name), calculationInput1.Name); Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile2.Name), calculationInput2.Name); - Assert.AreSame(semiProbabilisticInput, calculationInput1.SemiProbabilisticParameters); - Assert.AreSame(semiProbabilisticInput, calculationInput2.SemiProbabilisticParameters); + Assert.AreSame(normProbabilityInput, calculationInput1.NormProbabilityParameters); + Assert.AreSame(normProbabilityInput, calculationInput2.NormProbabilityParameters); CompareGeneralInputToInput(generalInput, calculationInput1); CompareGeneralInputToInput(generalInput, calculationInput2); @@ -1157,7 +1157,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new SemiProbabilisticPipingInput()).ToArray(); + new NormProbabilityPipingInput()).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup;