Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs =================================================================== diff -u -r4047 -r4070 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4047) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeTest.cs (.../DikeTest.cs) (revision 4070) @@ -19,13 +19,14 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System.Collections.Generic; +using System.Linq; +using Deltares.Dam.Data; using Deltares.Geometry; using Deltares.Geotechnics.GeotechnicalGeometry; -using Deltares.Dam.Data; -using NUnit.Framework; -using System.Linq; using Deltares.Geotechnics.Soils; using Deltares.Geotechnics.SurfaceLines; +using NUnit.Framework; namespace Deltares.Dam.Tests { @@ -38,51 +39,58 @@ private SurfaceLine2 surfaceLine1; private SoilProfile1D soilProfile; - [SetUp] - public void TestFixtureSetup() + [TearDown] + public void TearDown() { + dike.Dispose(); } [SetUp] + public void TestFixtureSetup() {} + + [SetUp] public void TestSetup() { // Dike - this.dike = new Dike(); - this.dike.Name = "Dike"; + dike = new Dike(); + dike.Name = "Dike"; // Segments - this.segment1 = new Segment(); - this.segment1.Name = "Segment1"; - // this.dike.Segments.Add(this.segment1); + segment1 = new Segment(); + segment1.Name = "Segment1"; + // this.dike.Segments.Add(this.segment1); // Locations - this.location1 = new Location(); - this.location1.Name = "Location1"; - this.location1.Segment = segment1; - this.dike.Locations.Add(location1); + location1 = new Location(); + location1.Name = "Location1"; + location1.Segment = segment1; + dike.Locations.Add(location1); // Surface lines surfaceLine1 = new SurfaceLine2 { Geometry = new LocalizedGeometryPointString(), - CharacteristicPoints = { GeometryMustContainPoint = true }, + CharacteristicPoints = + { + GeometryMustContainPoint = true + }, Name = "SurfaceLine1" }; - this.dike.SurfaceLines2.Add(surfaceLine1); + dike.SurfaceLines2.Add(surfaceLine1); // Soil profiles - this.soilProfile = new SoilProfile1D(); - this.soilProfile.Name = "SoilProfile1"; - this.dike.SoilProfiles.Add(soilProfile); + soilProfile = new SoilProfile1D(); + soilProfile.Name = "SoilProfile1"; + dike.SoilProfiles.Add(soilProfile); // Locations' Segments - this.location1.Segment = segment1; + location1.Segment = segment1; // Locations' surface lines - this.location1.SurfaceLine2 = this.surfaceLine1; + location1.SurfaceLine2 = surfaceLine1; // Segments' Soil profile probabilities - this.segment1.AddSoilProfileProbability(soilProfile, 100.0, FailureMechanismSystemType.StabilityInside); + segment1.AddSoilProfileProbability(soilProfile, 100.0, FailureMechanismSystemType.StabilityInside); surfaceLine1.AddCharacteristicPoint(new GeometryPoint(15.3, 0.0, -3.52)); surfaceLine1.AddCharacteristicPoint(new GeometryPoint(19.4, 0.0, -1.46), CharacteristicPointType.DikeToeAtRiver); @@ -92,12 +100,6 @@ surfaceLine1.AddCharacteristicPoint(new GeometryPoint(85.4, 0.0, -3.61)); } - [TearDown] - public void TearDown() - { - dike.Dispose(); - } - [Test] public void DefaultConstructor_ExpectedValues() { @@ -111,17 +113,17 @@ Assert.AreEqual(0, newDike.Locations.Count); } } - + [Test] public void TestDikeIntegrity() { - Assert.IsNotNull(this.dike); + Assert.IsNotNull(dike); - Assert.AreEqual("Dike", this.dike.Name); + Assert.AreEqual("Dike", dike.Name); //Assert.IsNotNull(this.dike.Segments); - Assert.IsNotNull(this.dike.Locations); - Assert.IsNotNull(this.dike.SurfaceLines2); - Assert.IsNotNull(this.dike.SoilProfiles); + Assert.IsNotNull(dike.Locations); + Assert.IsNotNull(dike.SurfaceLines2); + Assert.IsNotNull(dike.SoilProfiles); } // [Test] @@ -138,74 +140,74 @@ [Test] public void TestDikeLocations() { - Assert.IsNotNull(this.location1); + Assert.IsNotNull(location1); - Assert.AreEqual(1, this.dike.Locations.Count); - Assert.AreEqual(this.location1, this.dike.Locations[0]); - Assert.AreEqual("Location1", this.location1.Name); + Assert.AreEqual(1, dike.Locations.Count); + Assert.AreEqual(location1, dike.Locations[0]); + Assert.AreEqual("Location1", location1.Name); } [Test] public void TestDikeSurfaceLines() { - Assert.IsNotNull(this.surfaceLine1); - Assert.IsNotNull(this.surfaceLine1.Geometry.Points); + Assert.IsNotNull(surfaceLine1); + Assert.IsNotNull(surfaceLine1.Geometry.Points); - Assert.AreEqual(1, this.dike.SurfaceLines2.Count); - Assert.AreEqual(this.surfaceLine1, this.dike.SurfaceLines2[0]); - Assert.AreEqual("SurfaceLine1", this.surfaceLine1.Name); + Assert.AreEqual(1, dike.SurfaceLines2.Count); + Assert.AreEqual(surfaceLine1, dike.SurfaceLines2[0]); + Assert.AreEqual("SurfaceLine1", surfaceLine1.Name); } [Test] public void TestDikeSoilProfiles() { - Assert.IsNotNull(this.soilProfile); + Assert.IsNotNull(soilProfile); - Assert.AreEqual(1, this.dike.SoilProfiles.Count); - Assert.AreEqual(this.soilProfile, this.dike.SoilProfiles[0]); - Assert.AreEqual("SoilProfile1", this.soilProfile.Name); + Assert.AreEqual(1, dike.SoilProfiles.Count); + Assert.AreEqual(soilProfile, dike.SoilProfiles[0]); + Assert.AreEqual("SoilProfile1", soilProfile.Name); } [Test] public void TestDikeLocationSegments() { - Assert.IsNotNull(this.location1.Segment); - Assert.AreEqual(this.segment1, this.location1.Segment); + Assert.IsNotNull(location1.Segment); + Assert.AreEqual(segment1, location1.Segment); } [Test] public void TestDikeLocationSurfaceLines() { - Assert.IsNotNull(this.location1.SurfaceLine2); - Assert.AreEqual(this.surfaceLine1, this.location1.SurfaceLine2); + Assert.IsNotNull(location1.SurfaceLine2); + Assert.AreEqual(surfaceLine1, location1.SurfaceLine2); } [Test] public void TestDikeSegmentsSoilProfileProbabilities() { - Assert.AreEqual(100, this.segment1.GetSoilProfileProbability(this.soilProfile, FailureMechanismSystemType.StabilityInside)); + Assert.AreEqual(100, segment1.GetSoilProfileProbability(soilProfile, FailureMechanismSystemType.StabilityInside)); } [Test] public void TestDikeSegmentsSurfaceLinePoints() { - var points = this.surfaceLine1.Geometry.Points; + IList points = surfaceLine1.Geometry.Points; Assert.AreEqual(6, points.Count); Assert.AreEqual(15.3, points[0].X); Assert.AreEqual(-3.52, points[0].Z); Assert.AreEqual(19.4, points[1].X); Assert.AreEqual(-1.46, points[1].Z); - Assert.AreEqual(points[1], this.surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver)); - Assert.AreEqual(points[2], this.surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); - Assert.AreEqual(points[3], this.surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder)); - Assert.AreEqual(points[4], this.surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); + Assert.AreEqual(points[1], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver)); + Assert.AreEqual(points[2], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); + Assert.AreEqual(points[3], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder)); + Assert.AreEqual(points[4], surfaceLine1.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); - Assert.AreEqual(0, this.surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None)); - Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, this.surfaceLine1.GetCharacteristicPoints(points[1]).First()); + Assert.AreEqual(0, surfaceLine1.GetCharacteristicPoints(points[0]).Count(cpt => cpt != CharacteristicPointType.None)); + Assert.AreEqual(CharacteristicPointType.DikeToeAtRiver, surfaceLine1.GetCharacteristicPoints(points[1]).First()); - Assert.IsTrue(this.surfaceLine1.HasDike()); + Assert.IsTrue(surfaceLine1.HasDike()); } } -} +} \ No newline at end of file