Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs =================================================================== diff -u -rc61ef8d3ee0558d0a032085a3f1b3cc4c0503b64 -r2ed0db8299205024c1c6b1eb10da05f588f5d649 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision c61ef8d3ee0558d0a032085a3f1b3cc4c0503b64) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision 2ed0db8299205024c1c6b1eb10da05f588f5d649) @@ -165,7 +165,7 @@ } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_NoAquiferLayer_NaN() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_NoAquiferLayer_NaN() { // Setup var pipingSoilLayers = new[] @@ -176,14 +176,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.0); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.0); // Assert Assert.IsNaN(result); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerAboveLevel_NaN() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerAboveLevel_NaN() { // Setup var pipingSoilLayers = new[] @@ -197,14 +197,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.0); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.0); // Assert Assert.IsNaN(result); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerCompletelyBelowLevel_ReturnAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerCompletelyBelowLevel_ReturnAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -217,14 +217,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(2.2); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(2.2); // Assert Assert.AreEqual(2.1, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerPartlyBelowLevel_ReturnAquiferLayerThicknessUpTillLevel() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerPartlyBelowLevel_ReturnAquiferLayerThicknessUpTillLevel() { // Setup var pipingSoilLayers = new[] @@ -237,14 +237,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.6); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.6); // Assert Assert.AreEqual(1.6, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerTopEqualToLevel_ReturnAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_AquiferLayerTopEqualToLevel_ReturnAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -257,14 +257,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.6); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.6); // Assert Assert.AreEqual(1.6, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TwoAquiferLayersCompletelyBelowLevel_ReturnConsecutiveAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TwoAquiferLayersCompletelyBelowLevel_ReturnConsecutiveAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -282,14 +282,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(2.2); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(2.2); // Assert Assert.AreEqual(1.6, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerTopEqualToLevel_ReturnConsecutiveAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerTopEqualToLevel_ReturnConsecutiveAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -310,14 +310,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(2.1); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(2.1); // Assert Assert.AreEqual(1.6, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerTopPartlyBelowLevel_ReturnConsecutiveAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerTopPartlyBelowLevel_ReturnConsecutiveAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -338,14 +338,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(2.0); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(2.0); // Assert Assert.AreEqual(1.5, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerCompletelyAboveLevel_ReturnBottomAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerCompletelyAboveLevel_ReturnBottomAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -366,14 +366,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.3); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.3); // Assert Assert.AreEqual(1.1, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerPartlyAboveLevel_ReturnConsecutiveAquiferLayerThicknessUpTillLevel() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TopmostAquiferLayerPartlyAboveLevel_ReturnConsecutiveAquiferLayerThicknessUpTillLevel() { // Setup var pipingSoilLayers = new[] @@ -390,14 +390,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.5); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.5); // Assert Assert.AreEqual(1.5, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_TwoConsecutiveAquiferLayersAndOneNonConsecutiveAquiferLayer_ReturnConsecutiveAquiferLayerThicknessUpTillLevel() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_TwoConsecutiveAquiferLayersAndOneNonConsecutiveAquiferLayer_ReturnConsecutiveAquiferLayerThicknessUpTillLevel() { // Setup var pipingSoilLayers = new[] @@ -419,14 +419,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.5); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.5); // Assert Assert.AreEqual(0.5, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_AllAquiferLayersAboveLevel_NaN() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_AllAquiferLayersAboveLevel_NaN() { // Setup var pipingSoilLayers = new[] @@ -447,14 +447,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(0.5); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(0.5); // Assert Assert.IsNaN(result); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_BottomAquiferLayerTopEqualToLevel_BottomAquiferLayerThickness() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_BottomAquiferLayerTopEqualToLevel_BottomAquiferLayerThickness() { // Setup var pipingSoilLayers = new[] @@ -471,14 +471,14 @@ var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - var result = profile.GetConsecutiveAquiferLayerThicknessBelowLevel(1.1); + var result = profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(1.1); // Assert Assert.AreEqual(1.1, result, 1e-6); } [Test] - public void GetConsecutiveAquiferLayerThicknessBelowLevel_LevelBelowProfile_ArgumentException() + public void GetTopmostConsecutiveAquiferLayerThicknessBelowLevel_LevelBelowProfile_ArgumentException() { // Setup var pipingSoilLayers = new[] @@ -491,7 +491,7 @@ var profile = new PipingSoilProfile(string.Empty, 0.5, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); // Call - TestDelegate call = () => profile.GetConsecutiveAquiferLayerThicknessBelowLevel(0.0); + TestDelegate call = () => profile.GetTopmostConsecutiveAquiferLayerThicknessBelowLevel(0.0); // Assert var message = string.Format("Level {0} is below the bottom of the soil profile {1}.", 0.0, 0.5);