Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs =================================================================== diff -u -r5922 -r5925 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs (.../SoilProfile2DDataModelTest.cs) (revision 5922) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.StixFileReader.Tests/SoilProfile2DDataModelTest.cs (.../SoilProfile2DDataModelTest.cs) (revision 5925) @@ -52,96 +52,99 @@ } [Test] - public void WhenDataModelWithMultipleLayersIsCreated_ThenSoilProfile2DIsAsExpected() + [TestCase(0.0)] + [TestCase(5.45)] + [TestCase(-15.225)] + public void WhenDataModelWithMultipleLayersIsCreated_ThenSoilProfile2DIsAsExpected(double shift) { PersistableDataModel dataModel = PersistableDataModelFactory.CreateSimpleDataModelWithMultipleLayers(); - SoilProfile2D soilProfile2D = new SoilProfile2DDataModel().Create(dataModel, 0.0); + SoilProfile2D soilProfile2D = new SoilProfile2DDataModel().Create(dataModel, shift); IList points = soilProfile2D.Geometry.Points; Assert.Multiple(() => { - Assert.That(points.ElementAt(0).LocationEquals(new GeometryPoint(12, 0, -5)), Is.True); - Assert.That(points.ElementAt(1).LocationEquals(new GeometryPoint(12, 0, 5)), Is.True); - Assert.That(points.ElementAt(2).LocationEquals(new GeometryPoint(15, 0, 5)), Is.True); - Assert.That(points.ElementAt(3).LocationEquals(new GeometryPoint(15, 0, -5)), Is.True); - Assert.That(points.ElementAt(4).LocationEquals(new GeometryPoint(10, 0, -10)), Is.True); - Assert.That(points.ElementAt(5).LocationEquals(new GeometryPoint(10, 0, 10)), Is.True); - Assert.That(points.ElementAt(6).LocationEquals(new GeometryPoint(20, 0, 10)), Is.True); - Assert.That(points.ElementAt(7).LocationEquals(new GeometryPoint(20, 0, -10)), Is.True); - Assert.That(points.ElementAt(8).LocationEquals(new GeometryPoint(18, 0, 5)), Is.True); - Assert.That(points.ElementAt(9).LocationEquals(new GeometryPoint(18, 0, -5)), Is.True); + Assert.That(points.ElementAt(0).LocationEquals(new GeometryPoint(12 + shift, 0, -5)), Is.True); + Assert.That(points.ElementAt(1).LocationEquals(new GeometryPoint(12 + shift, 0, 5)), Is.True); + Assert.That(points.ElementAt(2).LocationEquals(new GeometryPoint(15 + shift, 0, 5)), Is.True); + Assert.That(points.ElementAt(3).LocationEquals(new GeometryPoint(15 + shift, 0, -5)), Is.True); + Assert.That(points.ElementAt(4).LocationEquals(new GeometryPoint(10 + shift, 0, -10)), Is.True); + Assert.That(points.ElementAt(5).LocationEquals(new GeometryPoint(10 + shift, 0, 10)), Is.True); + Assert.That(points.ElementAt(6).LocationEquals(new GeometryPoint(20 + shift, 0, 10)), Is.True); + Assert.That(points.ElementAt(7).LocationEquals(new GeometryPoint(20 + shift, 0, -10)), Is.True); + Assert.That(points.ElementAt(8).LocationEquals(new GeometryPoint(18 + shift, 0, 5)), Is.True); + Assert.That(points.ElementAt(9).LocationEquals(new GeometryPoint(18 + shift, 0, -5)), Is.True); }); Assert.That(soilProfile2D.Geometry.Surfaces.Count, Is.EqualTo(3)); List curves = soilProfile2D.Surfaces.ElementAt(0).GeometrySurface.OuterLoop.CurveList; Assert.Multiple(() => { - Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, -5), - new GeometryPoint(12, 0, 5))), Is.True); - Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, 5), - new GeometryPoint(15, 0, 5))), Is.True); - Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(15, 0, -5))), Is.True); - Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, -5), - new GeometryPoint(12, 0, -5))), Is.True); + Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12 + shift, 0, -5), + new GeometryPoint(12 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, -5))), Is.True); + Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, -5), + new GeometryPoint(12 + shift, 0, -5))), Is.True); }); curves = soilProfile2D.Surfaces.ElementAt(1).GeometrySurface.OuterLoop.CurveList; Assert.Multiple(() => { - Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, -10), - new GeometryPoint(10, 0, 10))), Is.True); - Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, 10), - new GeometryPoint(20, 0, 10))), Is.True); - Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, 10), - new GeometryPoint(20, 0, -10))), Is.True); - Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, -10), - new GeometryPoint(10, 0, -10))), Is.True); + Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(10 + shift, 0, -10), + new GeometryPoint(10 + shift, 0, 10))), Is.True); + Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(10 + shift, 0, 10), + new GeometryPoint(20 + shift, 0, 10))), Is.True); + Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(20 + shift, 0, 10), + new GeometryPoint(20 + shift, 0, -10))), Is.True); + Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(20 + shift, 0, -10), + new GeometryPoint(10 + shift, 0, -10))), Is.True); }); curves = soilProfile2D.Surfaces.ElementAt(2).GeometrySurface.OuterLoop.CurveList; Assert.Multiple(() => { - Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(18, 0, 5))), Is.True); - Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, 5), - new GeometryPoint(18, 0, -5))), Is.True); - Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, -5), - new GeometryPoint(15, 0, 5))), Is.True); - Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(15, 0, 5))), Is.True); + Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(18 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(18 + shift, 0, 5), + new GeometryPoint(18 + shift, 0, -5))), Is.True); + Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(18 + shift, 0, -5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); }); - Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(0).LocationEquals(new GeometryPoint(10, 0, 10)), Is.True); - Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(1).LocationEquals(new GeometryPoint(20, 0, 10)), Is.True); + Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(0).LocationEquals(new GeometryPoint(10 + shift, 0, 10)), Is.True); + Assert.That(soilProfile2D.Geometry.SurfaceLine.Points.ElementAt(1).LocationEquals(new GeometryPoint(20 + shift, 0, 10)), Is.True); curves = soilProfile2D.Geometry.Curves; Assert.Multiple(() => { - Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, -5), - new GeometryPoint(12, 0, 5))), Is.True); - Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12, 0, 5), - new GeometryPoint(15, 0, 5))), Is.True); - Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(15, 0, -5))), Is.True); - Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, -5), - new GeometryPoint(12, 0, -5))), Is.True); - Assert.That(curves.ElementAt(4).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, -10), - new GeometryPoint(10, 0, 10))), Is.True); - Assert.That(curves.ElementAt(5).LocationEquals(new GeometryCurve(new GeometryPoint(10, 0, 10), - new GeometryPoint(20, 0, 10))), Is.True); - Assert.That(curves.ElementAt(6).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, 10), - new GeometryPoint(20, 0, -10))), Is.True); - Assert.That(curves.ElementAt(7).LocationEquals(new GeometryCurve(new GeometryPoint(20, 0, -10), - new GeometryPoint(10, 0, -10))), Is.True); - Assert.That(curves.ElementAt(8).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(18, 0, 5))), Is.True); - Assert.That(curves.ElementAt(9).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, 5), - new GeometryPoint(18, 0, -5))), Is.True); - Assert.That(curves.ElementAt(10).LocationEquals(new GeometryCurve(new GeometryPoint(18, 0, -5), - new GeometryPoint(15, 0, 5))), Is.True); - Assert.That(curves.ElementAt(11).LocationEquals(new GeometryCurve(new GeometryPoint(15, 0, 5), - new GeometryPoint(15, 0, 5))), Is.True); + Assert.That(curves.ElementAt(0).LocationEquals(new GeometryCurve(new GeometryPoint(12 + shift, 0, -5), + new GeometryPoint(12 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(1).LocationEquals(new GeometryCurve(new GeometryPoint(12 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(2).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, -5))), Is.True); + Assert.That(curves.ElementAt(3).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, -5), + new GeometryPoint(12 + shift, 0, -5))), Is.True); + Assert.That(curves.ElementAt(4).LocationEquals(new GeometryCurve(new GeometryPoint(10 + shift, 0, -10), + new GeometryPoint(10 + shift, 0, 10))), Is.True); + Assert.That(curves.ElementAt(5).LocationEquals(new GeometryCurve(new GeometryPoint(10 + shift, 0, 10), + new GeometryPoint(20 + shift, 0, 10))), Is.True); + Assert.That(curves.ElementAt(6).LocationEquals(new GeometryCurve(new GeometryPoint(20 + shift, 0, 10), + new GeometryPoint(20 + shift, 0, -10))), Is.True); + Assert.That(curves.ElementAt(7).LocationEquals(new GeometryCurve(new GeometryPoint(20 + shift, 0, -10), + new GeometryPoint(10 + shift, 0, -10))), Is.True); + Assert.That(curves.ElementAt(8).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(18 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(9).LocationEquals(new GeometryCurve(new GeometryPoint(18 + shift, 0, 5), + new GeometryPoint(18 + shift, 0, -5))), Is.True); + Assert.That(curves.ElementAt(10).LocationEquals(new GeometryCurve(new GeometryPoint(18 + shift, 0, -5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); + Assert.That(curves.ElementAt(11).LocationEquals(new GeometryCurve(new GeometryPoint(15 + shift, 0, 5), + new GeometryPoint(15 + shift, 0, 5))), Is.True); }); ValidationResult[] validationResults = soilProfile2D.Surfaces[0].ValidateLayer();