Index: DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs =================================================================== diff -u -r875 -r2135 --- DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 875) +++ DamClients/DamUI/trunk/src/Dam/Tests/LocationTest.cs (.../LocationTest.cs) (revision 2135) @@ -19,10 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using Deltares.Dam.Data; -using Deltares.Geometry; -using Deltares.Geometry.TestUtils; using NUnit.Framework; namespace Deltares.Dam.Tests @@ -38,8 +35,8 @@ var expectedLocation = new Location { Name = "Sand", - SheetPileLength = 10.1, - RwBankProtectionBottomLevel = 11.11 + PlLineOffsetBelowDikeTopAtPolder = 10.1, + DampingFactorPL3 = 11.11 }) using (var actualLocation = new Location()) { @@ -48,8 +45,8 @@ { actualLocation.SetParameterFromNameValuePair(soilDetail.Key, soilDetail.Value); } - Assert.AreEqual(expectedLocation.SheetPileLength, actualLocation.SheetPileLength, cTolerance); - Assert.AreEqual(expectedLocation.RwBankProtectionBottomLevel, actualLocation.RwBankProtectionBottomLevel, + Assert.AreEqual(expectedLocation.PlLineOffsetBelowDikeTopAtPolder, actualLocation.PlLineOffsetBelowDikeTopAtPolder, cTolerance); + Assert.AreEqual(expectedLocation.DampingFactorPL3, actualLocation.DampingFactorPL3, cTolerance); } } @@ -58,8 +55,6 @@ public void Location_ConstructNewInstance_HasDefaultValuesSet() { // setup - var geometryPointComparer = new GeometryPointComparer(); - var sheetPilePoint = new GeometryPoint(); const bool areLocalXzObjectsCreated = false; const double penetrationLength = 0.0; const double trafficLoad = 0.0; @@ -68,10 +63,6 @@ const double plLineOffsetBelowDikeTopAtPolder = 1.5; const double plLineOffsetBelowShoulderBaseInside = 0.1; const double plLineOffsetBelowDikeToeAtPolder = 0.1; - const double plLineOffsetDryBelowDikeTopAtRiver = 0.5; - const double plLineOffsetDryBelowDikeTopAtPolder = 1.5; - const double plLineOffsetDryBelowShoulderBaseInside = 0.1; - const double plLineOffsetDryBelowDikeToeAtPolder = 0.1; const double stabilityShoulderGrowSlope = 0.3333333333333; const double stabilityShoulderGrowDeltaX = 2.0; const double stabilitySlopeAdaptionDeltaX = 2.0; @@ -80,7 +71,6 @@ var actualLocation = new Location(); // assert - Assert.AreEqual(0, geometryPointComparer.Compare(sheetPilePoint, actualLocation.SheetPilePoint)); Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated); Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength); Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad); @@ -89,19 +79,10 @@ Assert.AreEqual(plLineOffsetBelowDikeTopAtPolder, actualLocation.PlLineOffsetBelowDikeTopAtPolder); Assert.AreEqual(plLineOffsetBelowShoulderBaseInside, actualLocation.PlLineOffsetBelowShoulderBaseInside); Assert.AreEqual(plLineOffsetBelowDikeToeAtPolder, actualLocation.PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(plLineOffsetDryBelowDikeTopAtRiver, actualLocation.PLLineOffsetDryBelowDikeTopAtRiver); - Assert.AreEqual(plLineOffsetDryBelowDikeTopAtPolder, actualLocation.PLLineOffsetDryBelowDikeTopAtPolder); - Assert.AreEqual(plLineOffsetDryBelowShoulderBaseInside, - actualLocation.PLLineOffsetDryBelowShoulderBaseInside); - Assert.AreEqual(plLineOffsetDryBelowDikeToeAtPolder, actualLocation.PLLineOffsetDryBelowDikeToeAtPolder); Assert.AreEqual(null, actualLocation.PlLineOffsetBelowDikeCrestMiddle); Assert.AreEqual(null, actualLocation.PlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(null, actualLocation.PlLineOffsetDryBelowDikeCrestMiddle); - Assert.AreEqual(null, actualLocation.PlLineOffsetDryFactorBelowShoulderCrest); Assert.AreEqual(null, actualLocation.UsePlLineOffsetBelowDikeCrestMiddle); Assert.AreEqual(null, actualLocation.UsePlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(null, actualLocation.UsePlLineOffsetDryBelowDikeCrestMiddle); - Assert.AreEqual(null, actualLocation.UsePlLineOffsetDryFactorBelowShoulderCrest); Assert.AreEqual(IntrusionVerticalWaterPressureType.Standard, actualLocation.IntrusionVerticalWaterPressure); Assert.AreEqual(stabilityShoulderGrowSlope, actualLocation.StabilityShoulderGrowSlope, 1e-12); Assert.AreEqual(stabilityShoulderGrowDeltaX, actualLocation.StabilityShoulderGrowDeltaX);