Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 4000) @@ -35,16 +35,16 @@ [Test, Ignore("To be replaced by stix file when stix files are supported")] public void TestDetermineStabilityUpliftWithStiFile() { - var damKernelInput = CreateDamKernelInput(); + 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)); + Path.Combine(damKernelInput.Location.StabilityOptions.SoilGeometries2DPath, soilGeometry2DName)); damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; var upliftHelper = new UpliftHelper(); - var upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); Assert.IsTrue(upliftSituation.IsUplift); damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; @@ -57,30 +57,30 @@ { SoilProfile2D soilProfile2D = DamEngineDataTestFactory.CreateSoilProfile2D(null); - var damKernelInput = CreateDamKernelInput(); + DamKernelInput damKernelInput = CreateDamKernelInput(); damKernelInput.SubSoilScenario.SoilProfileType = SoilProfileType.ProfileType2D; - damKernelInput.SubSoilScenario.StiFileName =""; + damKernelInput.SubSoilScenario.StiFileName = ""; damKernelInput.SubSoilScenario.FullStiFileName = ""; damKernelInput.SubSoilScenario.SoilProfile2D = soilProfile2D; damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; var upliftHelper = new UpliftHelper(); - var upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); + 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); } - + private static DamKernelInput CreateDamKernelInput() { const string testFolder = @"KernelWrappers\Common\TestFiles"; - var projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); - var soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); + string projectPath = Path.GetFullPath(Path.Combine(Directory.GetCurrentDirectory(), testFolder)); + string soilDbName = Path.Combine(projectPath, "soilMaterials.mdb"); - var location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); + Location location = DamEngineDataTestFactory.CreateLocation(FactoryForSurfaceLines.CreateSurfaceLineTutorial1()); location.StabilityOptions = new StabilityOptions(); location.StabilityOptions.TrafficLoad = 10.0; location.StabilityOptions.SoilGeometries2DPath = projectPath; @@ -99,7 +99,5 @@ return damKernelInput; } - - } -} +} \ No newline at end of file