Index: DamClients/DamUI/branches/DamUI 19.1/src/Dam/Tests/LocationTest.cs =================================================================== diff -u -r2360 -r2715 --- DamClients/DamUI/branches/DamUI 19.1/src/Dam/Tests/LocationTest.cs (.../DamUI 19.1; closed after 19.1.500 release/src/Dam/Tests/LocationTest.cs) (revision 2360) +++ DamClients/DamUI/branches/DamUI 19.1/src/Dam/Tests/LocationTest.cs (.../DamUI 19.1/src/Dam/Tests/LocationTest.cs) (revision 2715) @@ -35,7 +35,6 @@ var expectedLocation = new Location { Name = "Sand", - PlLineOffsetBelowDikeTopAtPolder = 10.1, DampingFactorPL3 = 11.11 }) using (var actualLocation = new Location()) @@ -45,7 +44,7 @@ { actualLocation.SetParameterFromNameValuePair(soilDetail.Key, soilDetail.Value); } - Assert.AreEqual(expectedLocation.PlLineOffsetBelowDikeTopAtPolder, actualLocation.PlLineOffsetBelowDikeTopAtPolder, cTolerance); + Assert.AreEqual(expectedLocation.DampingFactorPL3, actualLocation.DampingFactorPL3, cTolerance); } @@ -58,12 +57,7 @@ const bool areLocalXzObjectsCreated = false; const double penetrationLength = 0.0; const double trafficLoad = 0.0; - const double tL_DegreeOfConsolidation = 0.0; const PLLineCreationMethod plLineCreationMethod = PLLineCreationMethod.ExpertKnowledgeRRD; - const double plLineOffsetBelowDikeTopAtRiver = 0.5; - const double plLineOffsetBelowDikeTopAtPolder = 1.5; - const double plLineOffsetBelowShoulderBaseInside = 0.1; - const double plLineOffsetBelowDikeToeAtPolder = 0.1; const double stabilityShoulderGrowSlope = 0.3333333333333; const double stabilityShoulderGrowDeltaX = 2.0; const double stabilitySlopeAdaptionDeltaX = 2.0; @@ -75,16 +69,8 @@ Assert.AreEqual(areLocalXzObjectsCreated, actualLocation.AreLocalXZObjectsCreated); Assert.AreEqual(penetrationLength, actualLocation.PenetrationLength); Assert.AreEqual(trafficLoad, actualLocation.TrafficLoad); - Assert.AreEqual(tL_DegreeOfConsolidation, actualLocation.TL_DegreeOfConsolidation); + Assert.AreEqual(null, actualLocation.TL_DegreeOfConsolidation); Assert.AreEqual(plLineCreationMethod, actualLocation.PLLineCreationMethod); - Assert.AreEqual(plLineOffsetBelowDikeTopAtRiver, actualLocation.PlLineOffsetBelowDikeTopAtRiver); - Assert.AreEqual(plLineOffsetBelowDikeTopAtPolder, actualLocation.PlLineOffsetBelowDikeTopAtPolder); - Assert.AreEqual(plLineOffsetBelowShoulderBaseInside, actualLocation.PlLineOffsetBelowShoulderBaseInside); - Assert.AreEqual(plLineOffsetBelowDikeToeAtPolder, actualLocation.PlLineOffsetBelowDikeToeAtPolder); - Assert.AreEqual(null, actualLocation.PlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(null, actualLocation.PlLineOffsetFactorBelowShoulderCrest); - Assert.AreEqual(null, actualLocation.UsePlLineOffsetBelowDikeCrestMiddle); - Assert.AreEqual(null, actualLocation.UsePlLineOffsetFactorBelowShoulderCrest); Assert.AreEqual(IntrusionVerticalWaterPressureType.Standard, actualLocation.IntrusionVerticalWaterPressure); Assert.AreEqual(stabilityShoulderGrowSlope, actualLocation.StabilityShoulderGrowSlope, 1e-12); Assert.AreEqual(stabilityShoulderGrowDeltaX, actualLocation.StabilityShoulderGrowDeltaX); @@ -103,17 +89,6 @@ Assert.AreEqual(expected, location.PolderLevel); } } - - [Test] - public void RiverLevel_ReadWrite_ShouldGiveExpectedResult() - { - // setup - const double expected = 1.1; - using (var location = new Location("test") {RiverLevel = expected}) - { - // checks - Assert.AreEqual(expected, location.RiverLevel); - } - } } + } \ No newline at end of file