Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs =================================================================== diff -u -r5af4cc02a453b09e6bd738f16a24b902ea82fb17 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs (.../LayerWithSoilCreator.cs) (revision 5af4cc02a453b09e6bd738f16a24b902ea82fb17) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/LayerWithSoilCreator.cs (.../LayerWithSoilCreator.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -25,12 +25,11 @@ using System.Linq; using Deltares.MacroStability.CSharpWrapper; using Deltares.MacroStability.CSharpWrapper.Input; +using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; +using CSharpWrapperWaterPressureInterpolationModel = Deltares.MacroStability.CSharpWrapper.Input.WaterPressureInterpolationModel; using Point2D = Core.Common.Base.Geometry.Point2D; -using ShearStrengthModel = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.ShearStrengthModel; -using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer; using SoilProfile = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile; using WaterPressureInterpolationModel = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaterPressureInterpolationModel; -using CSharpWrapperWaterPressureInterpolationModel = Deltares.MacroStability.CSharpWrapper.Input.WaterPressureInterpolationModel; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs =================================================================== diff -u -r76b7301d68563296eb8a537d5d7cb872aae99da7 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs (.../MacroStabilityInputCreator.cs) (revision 76b7301d68563296eb8a537d5d7cb872aae99da7) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/MacroStabilityInputCreator.cs (.../MacroStabilityInputCreator.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -32,7 +32,6 @@ using Riskeer.MacroStabilityInwards.KernelWrapper.Kernels.Waternet; using KernelPreconsolidationStress = Deltares.MacroStability.CSharpWrapper.Input.PreconsolidationStress; using SoilProfile = Deltares.MacroStability.CSharpWrapper.Input.SoilProfile; -using WaternetCreationMode = Deltares.MacroStability.CSharpWrapper.Input.WaternetCreationMode; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/UpliftVanWaternetCreatorInputCreator.cs =================================================================== diff -u -rb85e9f01322d9f98777fa8d2ce0f37683666805a -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/UpliftVanWaternetCreatorInputCreator.cs (.../UpliftVanWaternetCreatorInputCreator.cs) (revision b85e9f01322d9f98777fa8d2ce0f37683666805a) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.KernelWrapper/Creators/Input/UpliftVanWaternetCreatorInputCreator.cs (.../UpliftVanWaternetCreatorInputCreator.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -104,7 +104,7 @@ DikeSoilScenario = WaternetCreatorInputHelper.ConvertDikeSoilScenario(input.DikeSoilScenario), WaterLevelRiverAverage = input.WaterLevelRiverAverage, DrainageConstructionPresent = input.DrainageConstruction.IsPresent, - DrainageConstruction = input.DrainageConstruction.IsPresent + DrainageConstruction = input.DrainageConstruction.IsPresent ? new Point2D(input.DrainageConstruction.XCoordinate, input.DrainageConstruction.ZCoordinate) : null, MinimumLevelPhreaticLineAtDikeTopRiver = input.MinimumLevelPhreaticLineAtDikeTopRiver, Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetCalculatorTest.cs =================================================================== diff -u -r65499de962e73adf616561841c1aedabeaadf700 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetCalculatorTest.cs (.../WaternetCalculatorTest.cs) (revision 65499de962e73adf616561841c1aedabeaadf700) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Calculators/Waternet/WaternetCalculatorTest.cs (.../WaternetCalculatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -235,8 +235,8 @@ using (new MacroStabilityInwardsKernelFactoryConfig()) { var factory = (TestMacroStabilityInwardsKernelFactory) MacroStabilityInwardsKernelWrapperFactory.Instance; - WaternetKernelStub WaternetKernel = factory.LastCreatedWaternetExtremeKernel; - WaternetKernel.ThrowExceptionOnValidate = true; + WaternetKernelStub waternetKernel = factory.LastCreatedWaternetExtremeKernel; + waternetKernel.ThrowExceptionOnValidate = true; WaternetCalculatorInput input = WaternetCalculatorInputTestFactory.CreateValidCalculatorInput(); var calculator = new TestWaternetCalculator(input, factory); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs =================================================================== diff -u -r44e8b00d548969e48987e6d3227c02e6555b2767 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs (.../LayerWithSoilCreatorTest.cs) (revision 44e8b00d548969e48987e6d3227c02e6555b2767) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilCreatorTest.cs (.../LayerWithSoilCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -28,11 +28,8 @@ using NUnit.Framework; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input; -using Point2D = Core.Common.Base.Geometry.Point2D; -using SoilLayer = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilLayer; -using SoilProfile = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.SoilProfile; -using WaterPressureInterpolationModel = Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input.WaterPressureInterpolationModel; using CSharpWrapperWaterPressureInterpolationModel = Deltares.MacroStability.CSharpWrapper.Input.WaterPressureInterpolationModel; +using Point2D = Core.Common.Base.Geometry.Point2D; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input { @@ -125,8 +122,8 @@ Assert.AreEqual(outerRing6, layersWithSoil[5].OuterRing); CollectionAssert.IsEmpty(layersWithSoil[5].InnerRings); AssertSoilLayerProperties(layer6, layersWithSoil[5]); - - SoilLayer[] originalSoilLayers = + + SoilLayer[] originalSoilLayers = { layer1, layer2, @@ -193,7 +190,7 @@ [TestCase(ShearStrengthModel.CPhiOrSuCalculated, ShearStrengthModelType.MohrCoulomb, ShearStrengthModelType.Shansep)] public void Create_ValidShearStrengthModel_ExpectedShearStrengthModel( ShearStrengthModel shearStrengthModel, ShearStrengthModelType expectedShearStrengthAbovePhreaticLevelModel, - ShearStrengthModelType expectedShearStrengthBelowPhreaticLevelModel) + ShearStrengthModelType expectedShearStrengthBelowPhreaticLevelModel) { // Setup var profile = new SoilProfile(new[] @@ -231,7 +228,7 @@ }, Enumerable.Empty()); // Call - LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(profile, out IDictionary layerLookup); + LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(profile, out IDictionary _); // Assert Assert.AreEqual(expectedWaterPressureInterpolationModel, layersWithSoil[0].WaterPressureInterpolationModel); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilTest.cs =================================================================== diff -u -r5b08c78c06e509f66037e36657526b0cd8219e40 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilTest.cs (.../LayerWithSoilTest.cs) (revision 5b08c78c06e509f66037e36657526b0cd8219e40) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/LayerWithSoilTest.cs (.../LayerWithSoilTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -20,11 +20,11 @@ // All rights reserved. using System; +using Core.Common.Base.Geometry; using Core.Common.TestUtil; using Deltares.MacroStability.CSharpWrapper.Input; using NUnit.Framework; using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input; -using Point2D = Core.Common.Base.Geometry.Point2D; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input { Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs =================================================================== diff -u -r55efc50f9a145502bdb4c68852b32d0ae8916ca5 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs (.../MacroStabilityInputCreatorTest.cs) (revision 55efc50f9a145502bdb4c68852b32d0ae8916ca5) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/MacroStabilityInputCreatorTest.cs (.../MacroStabilityInputCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -34,7 +34,6 @@ using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Calculators.Waternet.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.TestUtil.Kernels.UpliftVan.Input; using SoilProfile = Deltares.MacroStability.CSharpWrapper.Input.SoilProfile; -using WaternetCreationMode = Deltares.MacroStability.CSharpWrapper.Input.WaternetCreationMode; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input { @@ -44,7 +43,7 @@ #region CreateUpliftVan [Test] - public void CreateUpliftVan_upliftVanInputNull_ThrowsArgumentNullException() + public void CreateUpliftVan_UpliftVanInputNull_ThrowsArgumentNullException() { // Call void Call() => MacroStabilityInputCreator.CreateUpliftVan( @@ -140,7 +139,7 @@ } [Test] - public void CreateUpliftVan_WithData_ReturnMacroStabilityInput() + public void CreateUpliftVan_ValidData_ReturnMacroStabilityInput() { // Setup UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create(); @@ -160,7 +159,7 @@ // Assert StabilityInput stabilityModel = macroStabilityInput.StabilityModel; - + Assert.AreEqual(Orientation.Inwards, stabilityModel.Orientation); Assert.AreEqual(SearchAlgorithm.Grid, stabilityModel.SearchAlgorithm); Assert.AreEqual(StabilityModelOptionType.UpliftVan, stabilityModel.ModelOption); @@ -234,7 +233,7 @@ #region CreateDailyWaternetForUpliftVan [Test] - public void CreateDailyWaternetForUpliftVan_upliftVanInputNull_ThrowsArgumentNullException() + public void CreateDailyWaternetForUpliftVan_UpliftVanInputNull_ThrowsArgumentNullException() { // Call void Call() => MacroStabilityInputCreator.CreateDailyWaternetForUpliftVan( @@ -256,7 +255,7 @@ var exception = Assert.Throws(Call); Assert.AreEqual("soils", exception.ParamName); } - + [Test] public void CreateDailyWaternetForUpliftVan_SurfaceLineNull_ThrowsArgumentNullException() { @@ -282,7 +281,7 @@ } [Test] - public void CreateDailyWaternetForUpliftVan_WithData_ReturnMacroStabilityInput() + public void CreateDailyWaternetForUpliftVan_ValidData_ReturnMacroStabilityInput() { // Setup UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create(); @@ -312,7 +311,7 @@ #region CreateExtremeWaternetForUpliftVan [Test] - public void CreateExtremeWaternetForUpliftVan_upliftVanInputNull_ThrowsArgumentNullException() + public void CreateExtremeWaternetForUpliftVan_UpliftVanInputNull_ThrowsArgumentNullException() { // Call void Call() => MacroStabilityInputCreator.CreateExtremeWaternetForUpliftVan( @@ -334,7 +333,7 @@ var exception = Assert.Throws(Call); Assert.AreEqual("soils", exception.ParamName); } - + [Test] public void CreateExtremeWaternetForUpliftVan_SurfaceLineNull_ThrowsArgumentNullException() { @@ -360,7 +359,7 @@ } [Test] - public void CreateExtremeWaternetForUpliftVan_WithData_ReturnMacroStabilityInput() + public void CreateExtremeWaternetForUpliftVan_ValidData_ReturnMacroStabilityInput() { // Setup UpliftVanCalculatorInput input = UpliftVanCalculatorInputTestFactory.Create(); @@ -390,7 +389,7 @@ #region CreateWaternet [Test] - public void CreateWaternet_waternetInputNull_ThrowsArgumentNullException() + public void CreateWaternet_WaternetInputNull_ThrowsArgumentNullException() { // Call void Call() => MacroStabilityInputCreator.CreateWaternet(null); @@ -401,7 +400,7 @@ } [Test] - public void CreateWaternet_WithData_ReturnMacroStabilityInput() + public void CreateWaternet_ValidData_ReturnMacroStabilityInput() { // Setup WaternetCalculatorInput input = WaternetCalculatorInputTestFactory.CreateValidCalculatorInput(); @@ -412,7 +411,7 @@ // Assert LayerWithSoil[] layersWithSoil = LayerWithSoilCreator.Create(input.SoilProfile, out IDictionary _); CollectionAssert.AreEqual(layersWithSoil.Select(lws => lws.Soil).ToList(), macroStabilityInput.StabilityModel.Soils, new SoilComparer()); - KernelInputAssert.AssertSoilProfile(SoilProfileCreator.Create(layersWithSoil), + KernelInputAssert.AssertSoilProfile(SoilProfileCreator.Create(layersWithSoil), macroStabilityInput.StabilityModel.ConstructionStages.Single().SoilProfile); PreConstructionStage preConstructionStage = macroStabilityInput.PreprocessingInput.PreConstructionStages.Single(); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/PreconsolidationStressCreatorTest.cs =================================================================== diff -u -rbaccce8a435f214c71867a6d19d4bb7c44410d5b -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/PreconsolidationStressCreatorTest.cs (.../PreconsolidationStressCreatorTest.cs) (revision baccce8a435f214c71867a6d19d4bb7c44410d5b) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/PreconsolidationStressCreatorTest.cs (.../PreconsolidationStressCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -22,10 +22,10 @@ using System; using System.Collections.Generic; using System.Linq; +using Core.Common.Base.Geometry; using NUnit.Framework; using Riskeer.MacroStabilityInwards.KernelWrapper.Calculators.Input; using Riskeer.MacroStabilityInwards.KernelWrapper.Creators.Input; -using Point2D = Core.Common.Base.Geometry.Point2D; using CSharpWrapperPreconsolidationStress = Deltares.MacroStability.CSharpWrapper.Input.PreconsolidationStress; namespace Riskeer.MacroStabilityInwards.KernelWrapper.Test.Creators.Input Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanCalculationGridCreatorTest.cs =================================================================== diff -u -r44e8b00d548969e48987e6d3227c02e6555b2767 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanCalculationGridCreatorTest.cs (.../UpliftVanCalculationGridCreatorTest.cs) (revision 44e8b00d548969e48987e6d3227c02e6555b2767) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanCalculationGridCreatorTest.cs (.../UpliftVanCalculationGridCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -43,7 +43,7 @@ } [Test] - public void Create_WithInput_ReturnUpliftVanCalculationGrid() + public void Create_WithSlipPlane_ReturnUpliftVanCalculationGrid() { // Setup var random = new Random(21); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanWaternetCreatorInputCreatorTest.cs =================================================================== diff -u -r44e8b00d548969e48987e6d3227c02e6555b2767 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanWaternetCreatorInputCreatorTest.cs (.../UpliftVanWaternetCreatorInputCreatorTest.cs) (revision 44e8b00d548969e48987e6d3227c02e6555b2767) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/UpliftVanWaternetCreatorInputCreatorTest.cs (.../UpliftVanWaternetCreatorInputCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -75,8 +75,8 @@ [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void CreateExtreme_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, - DikeSoilScenario expectedDikeSoilScenario) + public void CreateExtreme_ValidDikeSoilScenario_ReturnInputWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, + DikeSoilScenario expectedDikeSoilScenario) { // Setup var input = new UpliftVanCalculatorInput( @@ -100,8 +100,8 @@ [Test] [Combinatorial] - public void CreateExtreme_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent, - [Values(true, false)] bool useDefaultOffsets) + public void CreateExtreme_WithInput_ReturnWaternetCreatorInput([Values(true, false)] bool drainageConstructionPresent, + [Values(true, false)] bool useDefaultOffsets) { // Setup var random = new Random(21); @@ -153,7 +153,7 @@ Assert.AreEqual(input.PhreaticLineOffsetsExtreme.BelowDikeToeAtPolder, waternetCreatorInput.PlLineOffsetBelowDikeToeAtPolder); Assert.AreEqual(input.PenetrationLengthExtreme, waternetCreatorInput.PenetrationLength); - AssertGeneralLocationValues(input, waternetCreatorInput); + AssertGeneralWaternetCreatorInputValues(input, waternetCreatorInput); AssertIrrelevantValues(waternetCreatorInput); } @@ -197,8 +197,8 @@ [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void CreateDaily_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, - DikeSoilScenario expectedDikeSoilScenario) + public void CreateDaily_ValidDikeSoilScenario_ReturnInputWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, + DikeSoilScenario expectedDikeSoilScenario) { // Setup var input = new UpliftVanCalculatorInput( @@ -222,8 +222,8 @@ [Test] [Combinatorial] - public void CreateDaily_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent, - [Values(true, false)] bool useDefaultOffsets) + public void CreateDaily_WithInput_ReturnWaternetCreatorInput([Values(true, false)] bool drainageConstructionPresent, + [Values(true, false)] bool useDefaultOffsets) { // Setup var random = new Random(21); @@ -275,11 +275,11 @@ Assert.AreEqual(input.PhreaticLineOffsetsDaily.BelowDikeToeAtPolder, waternetCreatorInput.PlLineOffsetBelowDikeToeAtPolder); Assert.AreEqual(input.PenetrationLengthDaily, waternetCreatorInput.PenetrationLength); - AssertGeneralLocationValues(input, waternetCreatorInput); + AssertGeneralWaternetCreatorInputValues(input, waternetCreatorInput); AssertIrrelevantValues(waternetCreatorInput); } - private static void AssertGeneralLocationValues(UpliftVanCalculatorInput input, WaternetCreatorInput waternetCreatorInput) + private static void AssertGeneralWaternetCreatorInputValues(UpliftVanCalculatorInput input, WaternetCreatorInput waternetCreatorInput) { Assert.AreEqual(input.WaterLevelRiverAverage, waternetCreatorInput.WaterLevelRiverAverage); Assert.AreEqual(input.DrainageConstruction.IsPresent, waternetCreatorInput.DrainageConstructionPresent); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputCreatorTest.cs =================================================================== diff -u -r44e8b00d548969e48987e6d3227c02e6555b2767 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputCreatorTest.cs (.../WaternetCreatorInputCreatorTest.cs) (revision 44e8b00d548969e48987e6d3227c02e6555b2767) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputCreatorTest.cs (.../WaternetCreatorInputCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -73,8 +73,8 @@ [TestCase(MacroStabilityInwardsDikeSoilScenario.ClayDikeOnSand, DikeSoilScenario.ClayDikeOnSand)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, DikeSoilScenario.SandDikeOnClay)] [TestCase(MacroStabilityInwardsDikeSoilScenario.SandDikeOnSand, DikeSoilScenario.SandDikeOnSand)] - public void Create_ValidDikeSoilScenario_ReturnLocationWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, - DikeSoilScenario expectedDikeSoilScenario) + public void Create_ValidDikeSoilScenario_ReturnInputWithDikeSoilScenario(MacroStabilityInwardsDikeSoilScenario macroStabilityInwardsDikeSoilScenario, + DikeSoilScenario expectedDikeSoilScenario) { // Setup var input = new WaternetCalculatorInput( @@ -96,8 +96,8 @@ [Test] [Combinatorial] - public void Create_WithInput_ReturnLocation([Values(true, false)] bool drainageConstructionPresent, - [Values(true, false)] bool useDefaultOffsets) + public void Create_WithInput_ReturnWaternetCreatorInput([Values(true, false)] bool drainageConstructionPresent, + [Values(true, false)] bool useDefaultOffsets) { // Setup var random = new Random(21); @@ -143,7 +143,7 @@ LeakageLengthInwardsPhreaticLine4 = leakageLengthInwardsPhreaticLine4, PiezometricHeadPhreaticLine2Outwards = piezometricHeadPhreaticLine2Outwards, PiezometricHeadPhreaticLine2Inwards = piezometricHeadPhreaticLine2Inwards, - PenetrationLength = penetrationLength, + PenetrationLength = penetrationLength }); // Call Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputHelperTest.cs =================================================================== diff -u -r5af4cc02a453b09e6bd738f16a24b902ea82fb17 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputHelperTest.cs (.../WaternetCreatorInputHelperTest.cs) (revision 5af4cc02a453b09e6bd738f16a24b902ea82fb17) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Input/WaternetCreatorInputHelperTest.cs (.../WaternetCreatorInputHelperTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -35,7 +35,7 @@ public void ConvertDikeSoilScenario_InvalidDikeSoilScenario_ThrowInvalidEnumArgumentException() { // Setup - var dikeSoilScenario = (MacroStabilityInwardsDikeSoilScenario) 99; + const MacroStabilityInwardsDikeSoilScenario dikeSoilScenario = (MacroStabilityInwardsDikeSoilScenario) 99; // Call void Call() => WaternetCreatorInputHelper.ConvertDikeSoilScenario(dikeSoilScenario); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs =================================================================== diff -u -ra5b0ec078310186800abc323de1dd773e20047c6 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs (.../UpliftVanCalculationGridResultCreatorTest.cs) (revision a5b0ec078310186800abc323de1dd773e20047c6) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanCalculationGridResultCreatorTest.cs (.../UpliftVanCalculationGridResultCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -33,7 +33,7 @@ public class UpliftVanCalculationGridResultCreatorTest { [Test] - public void Create_SlipPlaneUpliftVanNull_ThrowsArgumentNullException() + public void Create_UpliftVanCalculationGridNull_ThrowsArgumentNullException() { // Call void Call() => UpliftVanCalculationGridResultCreator.Create(null); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs =================================================================== diff -u -ra5b0ec078310186800abc323de1dd773e20047c6 -rca2e4b3a0824dd8b142fae068b29ee2fbbd1069e --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs (.../UpliftVanSlidingCurveResultCreatorTest.cs) (revision a5b0ec078310186800abc323de1dd773e20047c6) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.KernelWrapper.Test/Creators/Output/UpliftVanSlidingCurveResultCreatorTest.cs (.../UpliftVanSlidingCurveResultCreatorTest.cs) (revision ca2e4b3a0824dd8b142fae068b29ee2fbbd1069e) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; using Deltares.MacroStability.CSharpWrapper.Output; @@ -46,7 +45,7 @@ } [Test] - public void Create_WithSlidingCurve_ReturnSlidingCurveResult() + public void Create_WithSlidingCurve_ReturnUpliftVanSlidingCurveResult() { // Setup var random = new Random(); @@ -109,7 +108,7 @@ } [Test] - public void Create_SlidingCurveWithSlices_ReturnSlidingCurveResult() + public void Create_SlidingCurveWithSlices_ReturnUpliftVanSlidingCurveResult() { // Setup var random = new Random(21);