Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DTests.cs =================================================================== diff -u -r6086 -r6103 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DTests.cs (.../SoilProfile2DTests.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile2DTests.cs (.../SoilProfile2DTests.cs) (revision 6103) @@ -21,7 +21,6 @@ using System.Collections.Generic; using System.Linq; -using Deltares.DamEngine.Data.GeometryExport; using Deltares.DamEngine.Data.Geotechnics; using Deltares.DamEngine.TestHelpers.Factories; using KellermanSoftware.CompareNetObjects; @@ -74,24 +73,13 @@ Z = 56.78 }; soilProfile2D.PreconsolidationStresses.Add(preConsolidationStress); - - //GeometryExporter.ExportToFile(soilProfile2D.Geometry, GeometryExporter.VisualizationFolder +"GeometryOrg.txt"); - //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + - // GeometryExporter.ExportJasonFile, soilProfile2D.Geometry, null); // When SoilProfile2D cloneSoilProfile2D = soilProfile2D.Clone(); - //GeometryExporter.ExportToFile(cloneSoilProfile2D.Geometry, GeometryExporter.VisualizationFolder +"GeometryCloned.txt"); - //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + - // GeometryExporter.ExportJasonFile, cloneSoilProfile2D.Geometry, null); cloneSoilProfile2D.Geometry.Points.First().X = -99.99; soilProfile2D.Geometry.Points.First().X = -7.77; - //GeometryExporter.ExportToFile(soilProfile2D.Geometry, GeometryExporter.VisualizationFolder +"GeometryOrgMoved.txt"); - //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + - // GeometryExporter.ExportJasonFile, soilProfile2D.Geometry, null); - // Then Assert.That(soilProfile2D.Geometry.Points.First().X, Is.EqualTo(-7.77)); Assert.That(soilProfile2D.Geometry.Curves[0].HeadPoint.X, Is.EqualTo(-7.77)); @@ -113,10 +101,6 @@ Assert.That(cloneSoilProfile2D.Geometry.Curves[0].SurfaceAtLeft, Is.EqualTo(null)); Assert.That(cloneSoilProfile2D.Surfaces[0].GeometrySurface.OuterLoop.CalcPoints[0].X, Is.EqualTo(-99.99)); Assert.That(cloneSoilProfile2D.Surfaces[0].GeometrySurface.OuterLoop.CurveList[0].HeadPoint.X, Is.EqualTo(-99.99)); - - //GeometryExporter.ExportToFile(cloneSoilProfile2D.Geometry, GeometryExporter.VisualizationFolder +"GeometryClonedMoved.txt"); - //GeometryExporter.ExportWithSurfaceLineToJsonFile(GeometryExporter.VisualizationFolder + - // GeometryExporter.ExportJasonFile, cloneSoilProfile2D.Geometry, null); } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r6086 -r6103 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 6103) @@ -359,7 +359,7 @@ [Test] [TestCase(TangentLinesDefinition.OnBoundaryLines, ConversionHelper.InputTangentLinesOnBoundaryLines)] [TestCase(TangentLinesDefinition.Specified, ConversionHelper.InputTangentLinesSpecified)] - //[TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)] + [TestCase(TangentLinesDefinition.Automatic, ConversionHelper.InputTangentLinesAutomatic)] public void CanConvertToInputTangentLinesDefinition(TangentLinesDefinition tangentLineType, int inputTangentLineType) { Assert.That(ConversionHelper.ConvertToInputTangentLinesDefinition(tangentLineType), Is.EqualTo(inputTangentLineType)); @@ -368,7 +368,7 @@ [Test] [TestCase(ConversionHelper.InputTangentLinesOnBoundaryLines, TangentLinesDefinition.OnBoundaryLines)] [TestCase(ConversionHelper.InputTangentLinesSpecified, TangentLinesDefinition.Specified)] - //[TestCase(ConversionHelper.InputTangentLinesAutomatic, TangentLinesDefinition.Automatic)] + [TestCase(ConversionHelper.InputTangentLinesAutomatic, TangentLinesDefinition.Automatic)] public void CanConvertToTangentLinesDefinition(int inputTangentLineType, TangentLinesDefinition tangentLineType) { Assert.That(ConversionHelper.ConvertToTangentLinesDefinition(inputTangentLineType), Is.EqualTo(tangentLineType)); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs =================================================================== diff -u -r6086 -r6103 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 6086) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/SoilProfileValidatorTests.cs (.../SoilProfileValidatorTests.cs) (revision 6103) @@ -260,6 +260,7 @@ [SetUICulture("nl-NL")] public void GivenSoilProfile2DWithDiscontinuousBottomAquiferLayer_WhenValidating_ThenLanguageNLThrowsException() { + // Setup var soilProfile = new SoilProfile2D { Geometry = new GeometryData @@ -270,7 +271,6 @@ }, Name = "SoilProfileTest" }; - // Setup SoilLayer2D soilLayer = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(0, -10, leftCoordinate, rightCoordinate, soilProfile); SoilLayer2D soilLayerAquiferPartOne = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-10, -20, leftCoordinate, middleXCoordinate, soilProfile, null, true); SoilLayer2D soilLayerAquiferPartTwo = FactoryForSoilProfiles.CreateRectangularSoilLayer2D(-5, -9, middleXCoordinate, rightCoordinate, soilProfile, null, true);