Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r4000 -r4052 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 4000) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 4052) @@ -27,77 +27,76 @@ using Deltares.DamEngine.TestHelpers.Factories; using NUnit.Framework; -namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.Common +namespace Deltares.DamEngine.Calculators.Tests.KernelWrappers.Common; + +[TestFixture] +public class UpliftHelperTests { - [TestFixture] - public class UpliftHelperTests + [Test, Ignore("To be replaced by stix file when stix files are supported")] + public void TestDetermineStabilityUpliftWithStiFile() { - [Test, Ignore("To be replaced by stix file when stix files are supported")] - public void TestDetermineStabilityUpliftWithStiFile() - { - DamKernelInput damKernelInput = CreateDamKernelInput(); - var soilGeometry2DName = "SimpleGeometry.sti"; - damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; - damKernelInput.SubSoilScenario.StiFileName = soilGeometry2DName; - damKernelInput.SubSoilScenario.FullStiFileName = Path.Combine(damKernelInput.ProjectDir, - Path.Combine(damKernelInput.Location.StabilityOptions.SoilGeometries2DPath, soilGeometry2DName)); + DamKernelInput damKernelInput = CreateDamKernelInput(); + var soilGeometry2DName = "SimpleGeometry.sti"; + damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileTypeStiFile; + damKernelInput.SubSoilScenario.StiFileName = soilGeometry2DName; + damKernelInput.SubSoilScenario.FullStiFileName = Path.Combine(damKernelInput.ProjectDir, + Path.Combine(damKernelInput.Location.StabilityOptions.SoilGeometries2DPath, soilGeometry2DName)); - damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; - var upliftHelper = new UpliftHelper(); - UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsTrue(upliftSituation.IsUplift); + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; + var upliftHelper = new UpliftHelper(); + UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsTrue(upliftSituation.IsUplift); - damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; - upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsFalse(upliftSituation.IsUplift); - } + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; + upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsFalse(upliftSituation.IsUplift); + } - [Test] - public void TestDetermineStabilityUpliftWithSoilProfile2D() - { - SoilProfile2D soilProfile2D = DamEngineDataTestFactory.CreateSoilProfile2D(null); + [Test] + public void TestDetermineStabilityUpliftWithSoilProfile2D() + { + SoilProfile2D soilProfile2D = DamEngineDataTestFactory.CreateSoilProfile2D(null); - DamKernelInput damKernelInput = CreateDamKernelInput(); - damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; - damKernelInput.SubSoilScenario.StiFileName = ""; - damKernelInput.SubSoilScenario.FullStiFileName = ""; - damKernelInput.SubSoilScenario.SoilProfile2D = soilProfile2D; + DamKernelInput damKernelInput = CreateDamKernelInput(); + damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; + damKernelInput.SubSoilScenario.StiFileName = ""; + damKernelInput.SubSoilScenario.FullStiFileName = ""; + damKernelInput.SubSoilScenario.SoilProfile2D = soilProfile2D; - damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; - var upliftHelper = new UpliftHelper(); - UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsTrue(upliftSituation.IsUplift); + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; + var upliftHelper = new UpliftHelper(); + UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsTrue(upliftSituation.IsUplift); - damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; - upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsFalse(upliftSituation.IsUplift); - } + damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; + upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + Assert.IsFalse(upliftSituation.IsUplift); + } - private static DamKernelInput CreateDamKernelInput() - { - const string testFolder = @"KernelWrappers\Common\TestFiles"; + private static DamKernelInput CreateDamKernelInput() + { + const string testFolder = @"KernelWrappers\Common\TestFiles"; - string projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); - string soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); + string projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); + string soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); - Location location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); - location.StabilityOptions = new StabilityOptions(); - location.StabilityOptions.TrafficLoad = 10.0; - location.StabilityOptions.SoilGeometries2DPath = projectPath; - location.StabilityOptions.SoilDatabaseName = soilDbName; - location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1; + Location location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); + location.StabilityOptions = new StabilityOptions(); + location.StabilityOptions.TrafficLoad = 10.0; + location.StabilityOptions.SoilGeometries2DPath = projectPath; + location.StabilityOptions.SoilDatabaseName = soilDbName; + location.ModelFactors.RequiredSafetyFactorStabilityInnerSlope = 1.1; - var subSoilScenario = new SoilGeometryProbability(); - subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability; + var subSoilScenario = new SoilGeometryProbability(); + subSoilScenario.SegmentFailureMechanismType = SegmentFailureMechanismType.Stability; - var damKernelInput = new DamKernelInput(); - damKernelInput.Location = location; - damKernelInput.SubSoilScenario = subSoilScenario; - damKernelInput.ProjectDir = projectPath; - damKernelInput.RiverLevelLow = null; - damKernelInput.DamFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification(); + var damKernelInput = new DamKernelInput(); + damKernelInput.Location = location; + damKernelInput.SubSoilScenario = subSoilScenario; + damKernelInput.ProjectDir = projectPath; + damKernelInput.RiverLevelLow = null; + damKernelInput.DamFailureMechanismeCalculationSpecification = new DamFailureMechanismeCalculationSpecification(); - return damKernelInput; - } + return damKernelInput; } } \ No newline at end of file