Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/SegmentTests.cs (.../SegmentTests.cs) (revision 4000) @@ -19,9 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using NUnit.Framework; using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.Geotechnics; +using NUnit.Framework; namespace Deltares.DamEngine.Data.Tests.General { @@ -31,7 +31,7 @@ [Test] public void CanGetMostProbableProbableProfile1DForStability() { - var segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D); + Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileType1D); Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).SoilProfile1D.Name); Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability).Name); Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); @@ -43,7 +43,7 @@ [Test] public void CanGetMostProbableProbableProfile1DForPiping() { - var segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D); + Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileType1D); Assert.AreEqual("profile 1D 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).SoilProfile1D.Name); Assert.AreEqual("profile 1D 2", segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping).Name); Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); @@ -55,7 +55,7 @@ [Test] public void CanGetMostProbableProbableProfile2DStiFileNameForStability() { - var segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile); + Segment segment = CreateSegment(SegmentFailureMechanismType.Stability, SoilProfileType.ProfileTypeStiFile); Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability).FullStiFileName); Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability)); @@ -67,62 +67,63 @@ [Test] public void CanGetMostProbableProbableProfile2DStiFileNameForPiping() { - var segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile); + Segment segment = CreateSegment(SegmentFailureMechanismType.Piping, SoilProfileType.ProfileTypeStiFile); Assert.AreEqual("sti filename 2", segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Piping).FullStiFileName); Assert.AreEqual("sti filename 2", segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Piping)); Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Piping)); Assert.AreEqual(null, segment.GetMostProbableSoilGeometryProbability(SegmentFailureMechanismType.Stability)); Assert.AreEqual(null, segment.GetMostProbableProfile2DStiFileName(SegmentFailureMechanismType.Stability)); Assert.AreEqual(null, segment.GetMostProbableProfile1D(SegmentFailureMechanismType.Stability)); } + private static Segment CreateSegment(SegmentFailureMechanismType segmentFailureMechanismType, SoilProfileType soilProfileType) { var segment = new Segment(); - segment.SoilProfileProbabilities.Add(new SoilGeometryProbability() + segment.SoilProfileProbabilities.Add(new SoilGeometryProbability { Probability = 0.1, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, FullStiFileName = "sti filename 1", - SoilProfile1D = new SoilProfile1D() + SoilProfile1D = new SoilProfile1D { Name = "profile 1D 1" } }); - segment.SoilProfileProbabilities.Add(new SoilGeometryProbability() + segment.SoilProfileProbabilities.Add(new SoilGeometryProbability { Probability = 0.4, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, FullStiFileName = "sti filename 2", - SoilProfile1D = new SoilProfile1D() + SoilProfile1D = new SoilProfile1D { Name = "profile 1D 2" } }); - segment.SoilProfileProbabilities.Add(new SoilGeometryProbability() + segment.SoilProfileProbabilities.Add(new SoilGeometryProbability { Probability = 0.3, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, FullStiFileName = "sti filename 3", - SoilProfile1D = new SoilProfile1D() + SoilProfile1D = new SoilProfile1D { Name = "profile 1D 3" } }); - segment.SoilProfileProbabilities.Add(new SoilGeometryProbability() + segment.SoilProfileProbabilities.Add(new SoilGeometryProbability { Probability = 0.2, SegmentFailureMechanismType = segmentFailureMechanismType, SoilProfileType = soilProfileType, FullStiFileName = "sti filename 4", - SoilProfile1D = new SoilProfile1D() + SoilProfile1D = new SoilProfile1D { Name = "profile 1D 4" } }); return segment; } } -} +} \ No newline at end of file