Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs =================================================================== diff -u -r5289 -r5386 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 5289) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityCommonHelperTests.cs (.../MacroStabilityCommonHelperTests.cs) (revision 5386) @@ -34,8 +34,6 @@ [TestFixture] public class MacroStabilityCommonHelperTests { - // For debugging purposes - private const string visualizationFolder = @"D:\src\dam\DamTools\GeometryVisualizer\"; private readonly double cTolerance = 0.001; [Test] @@ -45,9 +43,7 @@ SurfaceLine2 surfaceLine = FactoryForSurfaceLines.CreateSurfaceLineWithDikeAndDitch(); var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -71,9 +67,7 @@ // Now combine the soilGeometryProbability with the same SurfaceLine2 which should result in the same SoilProfile2D MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = soilGeometryProbability.SoilProfile2D.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -101,9 +95,6 @@ // being cut on the left with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -131,9 +122,6 @@ // being extended to the left with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -157,9 +145,7 @@ // being cut on the right with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -187,9 +173,7 @@ // being extended to the right with 5.0 meters var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -210,8 +194,9 @@ var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + // GeometryExporter.ExportToFile(geometry, GeometryExporter.VisualizationFolder + "Geometry.txt"); + // GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + + // GeometryExporter.ExportJasonFile, geometry, surfaceLine.Geometry); Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -232,9 +217,7 @@ // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine) var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D)); @@ -255,9 +238,7 @@ // SoilProfile2D is removed (between top boundary of the SoilProfile2D and the surfaceLine) var combinedProfile = MacroStabilityCommonHelper.CombineSoilProfileWithSurfaceLine(soilGeometryProbability, surfaceLine, new Soil()); GeometryData geometry = combinedProfile.Geometry; - // For debugging purposes - // GeometryExporter.ExportToFile(geometry, visualizationFolder + "Geometry.txt"); - // GeometryExporter.ExportToJsonFile(geometry, visualizationFolder + "Geometry.json"); + Assert.Multiple(() => { Assert.That(soilGeometryProbability.SoilProfileType, Is.EqualTo(SoilProfileType.ProfileType2D));